From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 9 Jul 2012 04:56:32 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~2326^2~1781
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=8d16df0eec002109fd5373ea870504f3632219c7;p=emacs.git

Merge from trunk.
---

8d16df0eec002109fd5373ea870504f3632219c7